aboot: Use fd and not absolute path

Motivated by https://github.com/bootc-dev/bootc/pull/1532/commits/6d2eb2aaa92e23f434c47e3d0ebadc0307d45289

(We need to have a shared helper for this stuff at some point)

diff --git a/src/libostree/ostree-bootloader-aboot.c b/src/libostree/ostree-bootloader-aboot.c
index c125ca5983651e3e983fa396c00b35fa6438b581..1a207e8d5f7f1147c170087bb561787710179884 100644 (file)
--- a/src/libostree/ostree-bootloader-aboot.c
+++ b/src/libostree/ostree-bootloader-aboot.c
@@ -130,6 +130,14 @@ _ostree_aboot_get_bls_config (OstreeBootloaderAboot *self, int bootversion, gcha
   return TRUE;
 }
 
+static void
+child_setup_fchdir (gpointer data)
+{
+  int fd = (int)(uintptr_t)data;
+  int rc = fchdir (fd);
+  g_assert (rc == 0);
+}
+
 static gboolean
 _ostree_bootloader_aboot_post_bls_sync (OstreeBootloader *bootloader, int bootversion,
                                         GCancellable *cancellable, GError **error)
@@ -159,13 +167,12 @@ _ostree_bootloader_aboot_post_bls_sync (OstreeBootloader *bootloader, int bootve
                                      &initramfs, &options, cancellable, error))
     return FALSE;
 
-  g_autofree char *path_str = g_file_get_path (self->sysroot->path);
-
   const char *const aboot_argv[]
-      = { "aboot-deploy", "-r", path_str, "-c", abootcfg, "-o", options, aboot, NULL };
+      = { "aboot-deploy", "-r", ".", "-c", abootcfg, "-o", options, aboot, NULL };
   int estatus;
-  if (!g_spawn_sync (NULL, (char **)aboot_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL,
-                     &estatus, error))
+
+  if (!g_spawn_sync (NULL, (char **)aboot_argv, NULL, G_SPAWN_SEARCH_PATH, child_setup_fchdir,
+                     (gpointer)(uintptr_t)self->sysroot->sysroot_fd, NULL, NULL, &estatus, error))
     {
       return FALSE;
     }